fix few things