Updated for new cycle
Updates for new cycle, other misc. changes and additions