minor improvements in unusable code.