class update

class tweak and 2 new options.