fix trailing comma handling, and builtin parsing
rebuilt