fix a lot of small bugs