Some Updates

Signed-off-by: Salja <salja8840@gmail.com>
Merge branch 'master' into rewrite