All bugs fixed and 2/3 new features added