minor fixes
minor fixes
fixed many issues