minor fixes
final product