Fixed bugs, changed naming, removed textboxes.