A few housekeeping changes

changed member variables to m_x
made a few cosmetic changes
added headers to ElementConstraints