Added live logging ability. TODO make optional!
Whitespace fixes