Fixed missing arrows and some spaces