Fixed some things and working on extended metadata packets