cleanup System.out.println to make romain happy :P
fix some issues storing data