New types, fix bugs, improve UI