Minor changes & added documentation