Minor changes

still don't trust this