Better prototype
More updates to about
fdsa
Merge branch 'jrouly'

mergin