Fixed

  • Several minor bugs