Update 7/2/2013

Garbage collection on server and client. Fix style of part of code.