bug fixed.
final version ready for upload.