Added parser functionality + minor modifications/fixes