more fixes, not sure if I broke it or it was broken before...