fixed some things i broke