fixed many more problems