First commit from Caltec - so many improvements that I am not even try to describe
fuzzy