merged some changes because i didn't use --ammend properly