V1.1 in progress, mostly style changes as well as a bugfix.