Better descriptions/logging and more code cleanup