Prefinal version. All major bugs cleared.