rose edit: fix bugs found during testing