Minor Cleanup
Fixed experimental parts not showing up