Version bump, minor code cleanup