shapes added, bugfixes