Updated documentation & added checks