removed some logging
added timestamp, some modifiers