Added Toggles and improve freeze command