Description and bugs fixed