ef80945 some tweaks