Make bodies easier to move around
Various fixes