reservation comment feature, bug fixes, and refactoring
Merged