Cleanup, add in a few types