Final version

Last few changes before end of the Space Apps Challenge