fixed more shtuffs