Fix many details preparing for Free and Pro versions