Improve inner model + clean up
Fix mastering tables download link