MORE SUPER IMPORTANT FIXES