minor fixes
some beautifying..