Fix stuff and clean up