Major Documentation Update and small code clean-up