cleaned up and bumped version
made some cleanups