remove case sensitivity
fix trailing comma bug