Fixed the broken... everything