wire up done button
Fixed previous bugs, found others. Sorta works now.