update makefile for new dependencies
fix vbat errors