Fixed single mode segfault and updated makefile