Fixed bugs & DB Repo