27.09/13 - fixed some errors with database