#80 fixed date issue and changed 'stek' a bit