Testing is done. Did some cleaning up.