just a few internal representation changes