fixing somestuff
added xsession and some plugins
merging stuff