added some assorted stuff