Minor improvements after initial commit