further cleanup of x domain constraint functions
added some more pending specs