Add new stuff and fixes offcourse