Almost all working now!
Some things to add