Assorted functions upgraded