bug-fix: final bug fixes