Updates

Deleted garbage, and minimal updates in code