fixes some little bugs