Michael changed some stuff and fixed stuff