Debug on error!
Fixing and enhancing.