Auto filling enabled and other small changes.