add parser and micro updates