stash
everything seem to finally work now
update commits, typo