smaller refactorings
fixes