Improvements and bug fixes

  • Fixed various minor bugs.