Cleaned up a few things, post hackathon