ext.h cleanup and expansion