iconography and some fixes