fixed 2 small bugs