added some more stuff that trygve mentioned