Lots of updates
Removed unkwnowns