brainstorming fixes