Updated last edit
smaller fixes