rename + minor changes