Small fixes
Sweeping changes across the board