mostly just some cleanup and some testing