Added log4j.properties and cosmetic changes