changed all the # into space.
up to client options and policies
removing the todo since it is done
fixing a typo in a test