small fixes and stuff