just some final stuff. See prev commit.