General Fixes

Cleaned up some extra super gross code.