Fixed up initialization bug, renamed