minor changes
final version for a while