major update with june 2013 stuff and more