Fixing the obvious stuff by mar77i and fixing the obvious stuff he forgot.