Integrated Greg's SGCraft, beginnings of fixing his code