more improvements, clean up, swhitched to deftheme