finish up comments and additional si tests