cleaned up some files and added tags to log messages