tidied up bonds
changed market schema