minor fixes
final version
final
test