Made some updates

Ready to commit