fixed more remarks