Added some bug fixes. Updated to use vesrion 0.2.0 of the server api.