Cleaned up
Updated some bits