Removed some keys and fixed small issues.