Various enhancements

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