Adding missing methods; rearranging initial values.