Minor naming fixes and experimental code.
Added stubs for constraint system.