bug fixes
code and database optimization