fixed issue, improvements