Gripe water! Life savor! It's like $10 at Walmart. Calms their tummy, gas and colic. And takes hiccups away instantly almost. I give my 3 month old a warm bath around 730, give her gripe water, swaddled her and breastfeed her and she sleeps through the night! Good luck!
Try to give him a warm bath before bed and usually gripe water works for me they sell it at walmart its amazing =)