Some updates
Some updates to make things pretty