Many changes + bugfixes :lollipop: