Reset DB and fixed issues