Many changes and many new bugs to fix, updated Forge to #1030.