pull fixes
some commits fixes