March 5, 2018

Beta bug fixes