Various changes

Signed-off-by: Chris <zidane@outlook.com>