hero window work

some cleanup