Castskill time argument added, some fixes