Rough cuts of application index and misc cleanup