improved style, fixed enter key to work now, updating comments