Added a null space cleaner
Improved logging