Various patches and improvements

Yes you are right.