Bug fixes & Added timestamps in logging.