reworked upgrade System + fixes