Gbw jm fix some stuff