More minor updates, error message fix, etc.