bug fixes, sorry mark database is slightly disabled