some more beautifying. not there yet