memory management stuff, and slight design changes...