Repaired IS; Fixes other little bugs