cleanups
Merge branch 'dondavici' of https://github.com/DonDavici/DreamPlex.git into dondavici