Organized and added features almost everywhere.