Fix abstract
Some updates
A bunch of small changes