removed error-maker dependency and minor improvements