fixed a lot of small details