more testing and goodies