Some bugs fixed and the policy html updated