bug fixes and backup commit