Everything now returns a debug class, do some cleanup too.