fixed verious "errors"