Added few logging commands, changed log file path, few clean-ups