Laid out the database structure, added more commands, cleaned up some details