Updated help and comments