small fixes, everything should work now