solve a lot of bugs!