More short stories and some design tweaks