Fixed Manifest and some minor bugs