Fix boundary geometry and comment spec