New code, fixes, much coolness, and some cleanup