Temp debugging/misc changes and environment sync