Minor task and solution detail design changes