Final

Some things still don't work fully, tried to fix these issues for
hours, with no sucess.