Hard set version and organize some variables, addressing #3