fix final issues