minor fixes
some initial functions