working on getting rid of bugs...