Finished reporting

Also cleaned up databases, cleaned up some things in shell.