stuff
merged stuff
fixed manifest