Fixed tests for last commit, added comments to parsing, fixed some issues with poorly/alternatively formatted files not formmatting