Minor updates
Overhaul