Prefinal version 2. All major bugs cleared.