Fix and Polish