staff breaks, bugfixes