bug fix and cleanup
release date change