Fix more several minor issues
A lot more major issues that got fixed