some stuff for gerstle/lightwalker#5 and other stuff