add enable/disable functionality, speed tweaks