Comm

Updates for competition. Hopefully this makes things better.