get rid of compiler warnings
fix unmarshalling error
implement Watch class