Checkpoint

Fixed another batch of runtime errors from updating the code to the new db