Changed some tags etc.