Added/corrected some things