more cleanup/additions. much more to come