Forget to save a few files, also added some tooltips before