fixed manifest and some other stuff