fixed some things i fucked up when trying to merge...