resolved three issues