Basic changes, not much honestly
Minor changes
save