Added some additional init options and cleaned up some stuff