General Updates

General Updates: Refer to code for specifics c: