Better *.properties handling and other small improvements