improve: smarter parser
mod: utility header
merge: