some fixed and log added