added default setttings and fixed date