bug fixes
fast commit