Not sure what I changed; definitely added support for scoring functions
probably no major changes, but just in case...
Removing debugging stuff, and fixed git settings