Some var corrections, establish data object