fixed many issues
minor updates