squashed some minor bugs