Some bugfixing + additional types within Packets

That took a long time to get used to git merging!
Anyhow, here are my first few suggestions. 

The delete of the .project file is unintentional, but it didn't know how to revert it. Anyways, I guess it's not needed and will be rebuilt by eclipse anyhow.. 

I hope I can add file-specific comments still later..