some more cleaning/updates