fixed a few bugs and added window selections