fixed many tings