made a fixy
made a fixya
fixed some residual upgrade issues