Fixed things and also stuff