cosmetic & other fixes

Signed-off-by: easymodo <easymodofrf@gmail.com>