Error fixes! Still needs a database