General cleanup and preping for 100