Minor changes, error stuff