Minor updates to definition and parser (added function holder)
Improved raw corpus of main.cpp (console)