started fixing defects from SPA