Remove 'description'
Fix small bug.
Prepare for networking