Added/changed some stuff