Fixed a lot of the issues discussed with Trine & Thomas.