fix MAX488 issue; also merge and push to be up to date