Last and Final Changes, some tweaks