some more fixes, good times