remove commented code. add pause feature and some minor fixes
varius fixies from zed-repo master