some minor updates, better plotting