Small fixes everywhere, removed lots of errors and todos