minor fixes and changes for Mega 2560