Improved logging and detaching Max from everything else...