fixes, testing

hey @jwolski