update manifest and fixed bugs