'refactor+fix+executor' (a lot of stuff)