solved some small issues