More alg, some file cleanup