Minor cleanup & version increased