Fixed _some_ bugs