spoj added, solved a few