some cleanup and some new fun