form coming along
autofocus
merged in changes