Corrected manifest & few other little things