Added some helpers and other tweaks