added manifest & general cleanup