Fix more known bugs. Probably introduce new ones.