tweaked some design things a bit