changed some dependency orderings
Special-casing some error messages line wrapping, closes #76