squashed minor bugs