Mostly bug fixes. Starting to figure out the expanding list and how it works.