Cleaned up some messes
and more