Removed comments option and extra test, fixed docs.