Looked through code and made some minor tweaks -- about to begin testing