final bug fixes before staging