Lots of minor changes.
Primitive hiribg is available.