Got rid of dwindow
Fxied marker file
even more crazy refactoring.