Chgs from testing - main Lib class & Parser

saving changes made while camping.