Database bug correction
Bug corrections and new features calculated