DB changes and bug fix

PLEASE RECREATE THE DB!!
touches