Adds feature tweaks from Martin