Added more stuff to UI and getters.