Fixed more issues with parsing, and decoding