cleaned up a lot of stuff and started tests