fix a few things i didnt like