Fixes typos and so on