bugs to fix & animations