synch my fork with with paddax master after cleaning up my earlier mess