Switched the items onto the config system and tweaked some more stuff with the advanced glass.