minor bug fixes. will create new branch for the rest