fixed bugs and destinations