Minor changes, change a die message, move to single quotes