Fixed some bugs --- Cannot launch right now, due to an IC2 problem