adding more systematics, minimal cleanup