fixed include bugs
improved animation