Improved descriptions. Added states