Clean up, merging in changes from use on sites