Majior Fix and addiotions!