updated salem to 3/20/13 client, fixed bugs