updated comment parser