Minor fixes. Body part still not working