Minor improvements and mod