Wip/smallthings

merge wip/lasse_do_not_touch first please since this chunk of commits contains the other ones.
Please merge manually via command line to avoid these stupid merge commits, ok? There shouldnt be any conflicts.