Misc fixes and tunng
Basic parser handling