fix success url for new resources
various bugfixes and tweaks
cleanup