fixes
Some cleanup