shape loading + bugfixes