Fixes; more additions