TODO added to logbook
TODOs resolved, unit tests improved.