Added log4j.properties and minor tweaks