Clean up DRC issues
Fix up DRC issues, add last parts