add clock switch procedure various fixes and improvements