version 2.0 major bugs solved