Cleaned a bit. Made time vars independent. Should be correct but animation wrong?