bugfixes, better create script