logging improvements
droplist changes
cleanup and improved logging
next step preparation
change file structure