Lots of stuff added, including pictures