Edited some things ...