Core functionality added, small UI changes.