ActivityState correct -> int
minor fixes