Fixed things more