Removed valgrind allocation problems
Added more keywords for bool conversion (on/off, yes/on)