more logging and such