Add traffic lights and improve some code