resolves #1 #4 #5

~moderator: @ScottBishop

~requested: 360

#1 #4 #5