Implement Institution Specs and Minor Refactoring.