merged in some more fixes fromdevel

Benjamin Mako Hill || Want to submit a patch?