Feature/frans fixes