Added logging in
Fixed merge conflict
Fixed logging in
Fixed merge conflicts
Fixed some problems from the merge