small changes, large bugs squashed