Config now tracks the initial stock size
Partial cleanup of session