Some bugfixing + additional types within Packets