edited 3.0 and other minor changes