major cleanup of ISD
final fix of some warnings

closes #473