code cleaned up and ready to test; includes git info