some more bug fixes

some more bug fixes and latest db backup