Small bugfixes and expected behaviour changes to already filled in values