Updates

Various updates. Added comments