Adding some more presentation goodies
Some minor bugfixes