more syntax and format fixes