Updated features and fixed bugs for Mark.