fixed that bug +  things.  last commit before GoT
turns 55/10?! wtf...