minor improvements. todo section