body disposal bug fixed and copy / paste update