some more fixes and shuc