Makefile fix and added Controller initialization