More cleans
Fixed a few issues that seemed to have already been fixed