Fixes local name and success message bugs