solved some a small problems