Cleaning up client display and auto-fill bug.