Fix issue #61 and other minor background things