some morre fixes
asdf