Updated some functions. Changed _Parsing file so it can now be run from command line also.