fixed many small things