Joimmons additions
Gen 1 fixes