some old changes; started transition to dwm