Added more typo/misc. fixes