update my branch and add a bunch of slight modifications

just one window now (removed SplitPanel)
dont push me: thats what she said

more a manual merge than anything else...got gititis....its a serious
condition