commit from macbook air with last changes made so far