OutOfMemory and other bugs..
Improved receiving server-side
Merged with better branch