afui - core - fixes issues #1 #6 #9