Cleanup and bug fixes

Changed operational mode - double-tap ON no longer requred...