Make GUI part of default, a few other small fixes

In default.