Added boats array, fix standards