Merge h0ward's updates