merge in to stable

Added resize stuff, stable as it'll ever be.