fixed some small issues- feels nicer