Reworking bits and pieces, cleaning up