Fixed startup order / Added Market Entry stuff