fixes, testing

hey @jwolski 
+M?