fixed some small bugs (: