more updates and cleanup on the assignments