Fixes for else statement. Fix for debugging