fixed 2 minor bugs