cleaned some sysouts, added TODO