Tons of bugfixes and partial rewrite of presentation
trouble
trouble