updated some stuffs
massive updates to data parsing. Works like a G6 now