heat could be warmer!

I'd start with a flush of the heater core. Undo both hoses to the core then use your garden hose on one side then the other. You'll probably find all kinds of nasty stuff coming out. Once clean you'll have plenty of heat.