readded rigbodies, tweaks, updated todo