added more features, fixed windows XP