Fixed up some issues, added optimization space.