revert to single instance
fix manifest version number
code clean up