Some Bug Fixes and Clarifying Documentations

Signed-off-by: Jedzkie <jedzkie13@rocketmail.com>