Strict Mode

Adding strict mode compliance and fixes.