Fix associations, cleanup and make sure actions are workign