Fix final errors, typos, cosmetic, etc.