Added upper limits and fixed dying animation