Fixing minor bugs and implementing enhancements.