Some updates
References and some other stuff