Toggle Working + many bug fixes