fixed some boss stuff and popup