Anti lag

Fixes issue #2 (I think...it appears to) and does a little cleanup