Manual Stim

some changes/fixes