Some updates to code base