Added two windows, other minor changes