added new story, did some general cleanup