More error handling
Clean-up
Merge misc+util