fixed bugs and move eagle