fixed setup and manifest