Finished first version of general g=2 curves