cleaned up nested resources, updated controllers