and a few more

Signed-off-by: Illori <illori@simplemachines.org>