Some editing here n there