Back to normal

Issues resolved, fully working version for V2.2