Added more todo hints and updated documentation