Added comments, simplified /me testing