Many fixes: smarter unmount, updates after review.