various fixes
not even that related to the interface..