Added some more stuff

If you're happy with the changes, approve it.