Some final touches for now