Commited db changes and stylistic fixes, some files may be missing