bug fixes, completed first run post-rebuild