solved some remarks