Major fixes to database, compiling/running at home now