add ci and subscore functions
clean up merge