bug fixes
Working