final commit message, bug fixes