more deconstuction --- allow setting of keys later...
fix bugs