Debugged model, added minor view upgrades.