Client side tweaks and additions to source