Add some stuff, tweak some stuff