Change some interfaces, fix some details...