fix a lot of small issues