Fixes minor typos and applies minor improvements