changed some shit? also comments lol. god i hate this dissertation...