Finished Parser and made minor changes