more small and stupid fixes