All the minor feedback from Jonas incorporated here. (major structural changes next!)