Added timestamps to db & other fixes;