cleared some errors 20120515 night