Various improvements 2