Corrected a few things, switched to using choices