Adding a few more customizations
Fix typos