Fixes, ET builder implementation, and partial GitHub implementation