Commits last bluck of work!!!
Adds last fixes