Condense and fix a few things