#169 small fixes, todos, enhancements