New version and some cleanup.