New features added and bugs fixed