bug fixes as well as added date option