some cleanup edits, added theme_bw, fix some spelling errors etc