Fixed a few things and kinematic joined the gera