remove Creator, various fixes