Update mackup.py

Updated with various updates from other users, and many more from me.