fixed bugs+add at