Small updates; partial quick moderation

Signed-off-by: Yoshi2889 <rick.2889@gmail.com>