Fixes, organizing of packets etc.