add support for 4-inch; minor fixes