Updated nightly with some fixes..