Fixed up bugs caused by merge, program launches now