pushing changes from first half of 26082013 todo