Major fixes
Minor fix