final fixes prior to move to main Arduino folder