patch minor changes from dev