Updated Comments & Docs