fixing the canonical and other things