moved around some bits & pieces. more desc var/func names