Added paint + bugfixes