Finished Abolished Tweaks. Fix #270.