Added some disabled forms, fixed US logic bug