fix show-stopping bugs