fixed a various amount of bugs