arm rewind doesn't get stuck at 'through point' / refactored and added methods to cell lib