Added and removed some documentation/comments