Update description, minor fixes