Couple of exception fixes
Add remaining forms of S, 3, 0