beauty fixes
more beautifying