Added a lot of nice stuff and text