added baseClass option; minor fixes