added advanced-plugin and various fixes