some minor fixes, descriptive name