Edited some classes, comits and log4j properties