more fixes!
uh oh, stuff wasnt caught