major adjustments and corrections/parser implemented