Some smaller changes and fixes ... I think.