Attempt to merge with 0.4p and auto resize code.