Eliminated a few bugs dealing with forms and devices.