fixes project configuration
bugfix & code layout
removed references to Log, replaced by L