Updated makefile and toolchain