Fix multiple mistakes