Massive overhaul. Many packages updated.
Improve some error handling things