Logical fixes, fixed name bug