merge in recent master; namespace specs; error checking