Minor update; mostly patches from Soule 2.2

Signed-off-by: devxdev <xdev@devxdev.com>