fixed a lot of changes