final fixes chapter3 SPA