final commit after bug fixes