updated logging for everything, and tried to normalise arguments a bit