cleanup, fix many small copy and past mistakes..