fixes and ect

Signed-off-by: fallenangelX <noneya@hotmail.com>