boss stuff and small tweaks