Fixed castles at the end and some clouds