Fix up & Added /me