Code fixes

just more fixes