reorganization, variables/hashtable, new include
same name
proper location for init
naming fix
function name fix
todo notice on parser