Small metacell support changes.
Few small bug fixes and such.
Bug fixes from last comit.