Fixes, improvement, last ATK14