A lot to fix yet

Signed-off-by: Grosswood <mozge4ok@gmail.com>