late night commit , minor tweaks