Various Updates

Small additions, and various code updates