fixed many small changes