Various changes to all aspects