fixed entrypoints etc