[s0012] Some Sunwell Fixes need to test some more will come soon =)

Signed-off-by: Salja <salja8840@gmail.com>