Simplify initial activity location, fix step counter