Fixed my silly bugs