Fixes minor issues, typos and more