Minor enhancements / todo section