Directory cleanup, Settings enhancements, number tweaking