added more fields and fixed so enter works