some slight consolidation and fixed one thing