minor bug fixes after workshop