more stuff — cleanup, fixes, etc.