bugfixed and added canvas