extra logging and some cleanup