Client serializable stuff
Fixed some stupid code