more granite stuff and bugfixes