added stuff and things and removed cruft