pulling fixes to git