Various changes (worst commit ever)