-no more strings :D + fix