Update stack, rewrite parts to be clearer, less sarcasm