more fixes
mo fixs
hmmm