added more control over edge options of 2D case, renamed some edge options