some TODOs and a define for logging
merged