fixes for a bunch of little bugs, especially with extra volunteers