added stuff that had been laying around