Large number of misc alterations