Parsing fixed (last time I promise lol) and made much simpler + minor bug fixes