fix & features ! (again)