Post editing + small upgrade tweaks