new features added and bugs fixed