Top Fall Fixes and Cleaning Mistakes