Bugfixed and Copy Paste errors fixed