Updated documentaion/comments