Update various client requested elements / work on general changes