disabled saving empty number, edited some comments