Changed some stuff, tags etc