more fixes and feats