bug fixes
first commit