Updated application and indices. Cleanups too.