some cosmetic changes - still wip