bumped version and tidied up a bit