add several hats & various fixes