Neat Fixes

First draft